bitkeeper revision 1.126 (3e71fc20anCOs2KFyD3-AMyHjdJQfg)

resolve merge conflicts manually

diff --cc .bk-to-hg
index 1e89e2aa25c892671893ab7985588f4763388d4d,a1e10bd62c67dd607a37c4d35361ad5d8555f4b4..5bd381ab73b75967e65d958273f0b6f60e4299c6
--- 1/.bk-to-hg
--- 2/.bk-to-hg
+++ b/.bk-to-hg
@@@ -2,9 -2,5 +2,7 @@@
  set -e
  test -L old/xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs
  rm      old/xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs
- test -L xenolinux-2.4.21-pre4-sparse/include/asm-xeno/hypervisor-ifs
- rm      xenolinux-2.4.21-pre4-sparse/include/asm-xeno/hypervisor-ifs
 +test -L tools/domain_builder/dom0_ops.h
 +rm      tools/domain_builder/dom0_ops.h
  (find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true
  exit 0

diff --cc .hg-to-bk
index c651ca74e7adc56e60c6b3f12bfbf3ca4d4ce5e5,817e56037e1dd5ad759573a266b9a5b820aacd12..dc30e753161763c1bd3b02ece364a500bc29ea7a
--- 1/.hg-to-bk
--- 2/.hg-to-bk
+++ b/.hg-to-bk
@@@ -5,12 -5,5 +5,8 @@@ mkdir -p old/xenolinux-2.4.16-spars
  mkdir -p old/xenolinux-2.4.16-sparse/include
  mkdir -p old/xenolinux-2.4.16-sparse/include/asm-xeno
  ln -s ../../../xen-2.4.16/include/hypervisor-ifs old/xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs
- mkdir -p xenolinux-2.4.21-pre4-sparse
- mkdir -p xenolinux-2.4.21-pre4-sparse/include
- mkdir -p xenolinux-2.4.21-pre4-sparse/include/asm-xeno
- ln -s ../../../xen/include/hypervisor-ifs xenolinux-2.4.21-pre4-sparse/include/asm-xeno/hypervisor-ifs
 +mkdir -p tools
 +mkdir -p tools/domain_builder
 +ln -s ../../xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/dom0/dom0_ops.h tools/domain_builder/dom0_ops.h
  (find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true
  exit 0

diff --cc .rootkeys
Simple merge

diff --cc xen/common/keyhandler.c
index e9f99fcf894725bf1ab06b237f19ca253a53724c,19943fff3e9ad609024e9f10d614621be3a249b1..dde9e0ff10efd1f52d8980a595a2940dc7d6a17c
--- 1/xen/common/keyhandler.c
--- 2/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@@ -118,17 -123,16 +126,18 @@@ void initialize_keytable(
  
      /* first initialize key handler table */
      for(i = 0; i < KEY_MAX; i++) 
-     key_table[i].handler = (key_handler *)NULL; 
-     
+       key_table[i].handler = (key_handler *)NULL; 
+       
      /* setup own handlers */
 +    add_key_handler('a', dump_timerq,    "dump ac_timer queues");
      add_key_handler('d', dump_registers, "dump registers"); 
-     add_key_handler('h', show_handlers,  "show this message");
+     add_key_handler('h', show_handlers, "show this message");
      add_key_handler('p', perfc_printall, "print performance counters"); 
      add_key_handler('P', perfc_reset,    "reset performance counters"); 
      add_key_handler('q', do_task_queues, "dump task queues + guest state");
-     add_key_handler('r', dump_runq,      "dump run queue"); 
 -    add_key_handler('B', kill_dom0, "reboot machine gracefully"); 
 -    add_key_handler('R', halt_machine, "reboot machine ungracefully"); 
++    add_key_handler('r', dump_runq,      "dump run queues");
++    add_key_handler('B', kill_dom0,      "reboot machine gracefully"); 
 +    add_key_handler('R', halt_machine,   "reboot machine ungracefully"); 
      
      return; 
  }